bitkeeper revision 1.1159.1.176 (41544614Jlzg1BYGAePPjQI7EV4V7A)

Turn off most xfrd debug, and add process id to the messages.

diff --git a/tools/xfrd/debug.h b/tools/xfrd/debug.h
index 69a6b4993713b1938a71f7936ec2e3e90f9d4b68..1f5a19d54d06ad9d7ab335895099cdfd0ad4b099 100644 (file)
--- a/tools/xfrd/debug.h
+++ b/tools/xfrd/debug.h
@@ -48,17 +48,17 @@
 
 #ifdef DEBUG
 
-#define dprintf(fmt, args...) fprintf(stdout, "[DBG] " MODULE_NAME ">%s" fmt, __FUNCTION__, ##args)
-#define wprintf(fmt, args...) fprintf(stderr, "[WRN] " MODULE_NAME ">%s" fmt, __FUNCTION__, ##args)
-#define iprintf(fmt, args...) fprintf(stderr, "[INF] " MODULE_NAME ">%s" fmt, __FUNCTION__, ##args)
-#define eprintf(fmt, args...) fprintf(stderr, "[ERR] " MODULE_NAME ">%s" fmt, __FUNCTION__, ##args)
+#define dprintf(fmt, args...) fprintf(stdout, "%d [DBG] " MODULE_NAME ">%s" fmt, getpid(), __FUNCTION__, ##args)
+#define wprintf(fmt, args...) fprintf(stderr, "%d [WRN] " MODULE_NAME ">%s" fmt, getpid(),__FUNCTION__, ##args)
+#define iprintf(fmt, args...) fprintf(stderr, "%d [INF] " MODULE_NAME ">%s" fmt, getpid(),__FUNCTION__, ##args)
+#define eprintf(fmt, args...) fprintf(stderr, "%d [ERR] " MODULE_NAME ">%s" fmt, getpid(),__FUNCTION__, ##args)
 
 #else
 
 #define dprintf(fmt, args...) do {} while(0)
-#define wprintf(fmt, args...) fprintf(stderr, "[WRN] " MODULE_NAME fmt, ##args)
-#define iprintf(fmt, args...) fprintf(stderr, "[INF] " MODULE_NAME fmt, ##args)
-#define eprintf(fmt, args...) fprintf(stderr, "[ERR] " MODULE_NAME fmt, ##args)
+#define wprintf(fmt, args...) fprintf(stderr, "%d [WRN] " MODULE_NAME fmt, getpid(), ##args)
+#define iprintf(fmt, args...) fprintf(stderr, "%d [INF] " MODULE_NAME fmt, getpid(), ##args)
+#define eprintf(fmt, args...) fprintf(stderr, "%d [ERR] " MODULE_NAME fmt, getpid(), ##args)
 
 #endif
 

diff --git a/tools/xfrd/xen_domain.c b/tools/xfrd/xen_domain.c
index fd7dd5f99ec7666a9f64c75a45d61a756776a75e..b061a86c4cab5af4901b115d24e72f82a9f3a913 100644 (file)
--- a/tools/xfrd/xen_domain.c
+++ b/tools/xfrd/xen_domain.c
@@ -16,7 +16,7 @@ typedef unsigned long u32;
 
 #define MODULE_NAME "XFRD"
 #define DEBUG 1
-//#undef DEBUG
+#undef DEBUG
 #include "debug.h"
 
 int domain_suspend(void *data, u32 dom){

diff --git a/tools/xfrd/xfrd.c b/tools/xfrd/xfrd.c
index 93062ca8fb3d900730ea161d8f8d722c9fd2b7ce..9c68afddb13f377b0d97227ba58c762bf0d0f37f 100644 (file)
--- a/tools/xfrd/xfrd.c
+++ b/tools/xfrd/xfrd.c
@@ -50,7 +50,7 @@
 
 #define MODULE_NAME "XFRD"
 #define DEBUG 1
-//#undef DEBUG
+#undef DEBUG
 #include "debug.h"
 
 /*